In Option::get_or_insert_with(), forget the None instead of dropping it.
#148562
+38
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
r? @ibraheemdev rustbot has assigned @ibraheemdev. Use |
|
cc @cyb0124 (this change is based on their idea) |
hkBst
suggested changes
Nov 6, 2025
library/coretests/tests/option.rs
Outdated
Comment on lines
498
to
501
| /// Test that `Option::get_or_insert_*` are usable in const contexts, including with types that | ||
| /// do not have `const Drop` (except for [`Option::get_or_insert()`], which is not const). | ||
| #[test] | ||
| fn option_const_get_or_insert() { |
There was a problem hiding this comment.
Maybe split this test such that we can use a more unambiguous name don't have to mention an exception.
library/core/src/option.rs
Outdated
Comment on lines
1819
to
1820
| // It could also be expressed as `core::ptr::write(self, Some(f()))`; that would be | ||
| // additional unsafe code, so should be avoided unless a reason is found. |
There was a problem hiding this comment.
maybe include the unsafe block inside the code example?
…ing it. This allows eliminating the `T: [const] Destruct` bounds and avoids generating an implicit `drop_in_place::<Option<T>>()` that will never do anything. Ideally, the compiler would prove that that drop is not necessary itself, but it currently doesn't, even with `const_precise_live_drops` enabled.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Per #148486 (comment)
In
Option::get_or_insert_with(), after replacing theNonewithSome, forget theNoneinstead of dropping it.This allows eliminating the
T: [const] Destructbounds, making the functions more flexible in (unstable) const contexts, and avoids generating an implicitdrop_in_place::<Option<T>>()that will never do anything (and which might even persist after optimization).